From: Peter Michael Green <plugwash@debian.org>
Date: Thu, 13 Feb 2025 22:28:11 +0000 (+0000)
Subject: Manual merge of version 4:24.8.4-1+rpi1 and 4:24.8.4-2 to produce 4:24.8.4-2+rpi1
X-Git-Tag: archive/raspbian/4%24.8.4-3+rpi1~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/success//%22mailto:kde%40ewsoftware.de/%22/%22http:/www.example.com/cgi/success/%22mailto:kde%40ewsoftware.de/%22?a=commitdiff_plain;h=7ae194e21f384e3c198afaf9fd3158170735237a;p=libreoffice.git

Manual merge of version 4:24.8.4-1+rpi1 and 4:24.8.4-2 to produce 4:24.8.4-2+rpi1
---

7ae194e21f384e3c198afaf9fd3158170735237a
diff --cc debian/changelog
index cf9fa8dc87e,0b9f4006efa..c5b3fbf37fa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,15 +1,32 @@@
- libreoffice (4:24.8.4-1+rpi1) trixie-staging; urgency=medium
++libreoffice (4:24.8.4-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Fri, 27 Apr 2018 02:14:18 +0000]
 +  * Disable testsuite.
 +
 +  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
 +  * Disable pdfium, it fails to build for armv6
 +
 +  [changes introduced in 1:7.2.4-3+rpi1 by Peter Michael Green]
 +  * Use clang 11, newer versions cause armv7 contamination issues.
 +
 +  [changes introduced in 4:24.2.5-1+rpi1 by Peter Michael Green]
 +  * Build with gcc rather than clang.
 +  * Disable skia.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 29 Dec 2024 21:32:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 11 Feb 2025 18:22:24 +0000
++
+ libreoffice (4:24.8.4-2) unstable; urgency=medium
+ 
+   * debian/patches/poppler-24.12.diff: fix build with poppler >= 24.12, from
+     upstream libroffice-24-8 branch (closes: #1093297)
+ 
+   * debian/rules:
+     - build completeley with clang on i386 (closes: #1092206)
+     - deduct firebirdX.Y-sever-core version from fb_config --version 
+     - be strict in which libfbclient2 we allow by forcing <<
+       in shlibs.local
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 26 Jan 2025 20:20:09 +0100
  
  libreoffice (4:24.8.4-1) unstable; urgency=medium
  
diff --cc debian/control
index 8632e8d9a00,2198886258a..824feff8c0f
--- a/debian/control
+++ b/debian/control
@@@ -14,7 -14,7 +14,8 @@@ Build-Depends: autoconf
                 binutils (>= 2.37-9) [ppc64],
                 bison,
                 bzip2,
+                clang [i386],
 +               clang-11 [alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el ppc64el],
                 debhelper-compat (= 12),
                 default-jdk (>= 2:1.9) [!hppa !hurd-amd64 !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !powerpcspe !s390 !sparc !ppc64el !s390x !armhf !armel] <!nojava>,
                 dh-python <!nopython>,
diff --cc debian/rules
index b69270143cf,dc0ed257a75..a43208cf44f
--- a/debian/rules
+++ b/debian/rules
@@@ -607,11 -606,10 +608,10 @@@ OOO_BE_ARCHS = $(filter hppa m68k mips 
  $(eval $(call gen_no_archs,OOO_BE_ARCHS))
  OOO_LE_ARCHS = $(filter-out $(OOO_BE_ARCHS),$(OOO_ARCHS))
  $(eval $(call gen_no_archs,OOO_LE_ARCHS))
- # s390x: bigendian, so no skia at all
  # ppc64el: see https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice/patch/?id=be47aa72aad414537d27f0a18af7d067f1398666 and
  #          https://github.com/llvm/llvm-project/issues/63214
- OOO_CLANG_ARCHS := $(filter-out alpha ia64 ppc64el mipsel mips64el armhf,$(OOO_LE_ARCHS))
- $(eval $(call gen_no_archs,OOO_CLANG_ARCHS))
 -OOO_CLANG_SUPPORTED_ARCHS := $(filter-out alpha ia64 ppc64el mipsel mips64el,$(OOO_LE_ARCHS))
++OOO_CLANG_SUPPORTED_ARCHS := $(filter-out alpha ia64 ppc64el mipsel mips64el armhf,$(OOO_LE_ARCHS))
+ $(eval $(call gen_no_archs,OOO_CLANG_SUPPORTED_ARCHS))
  
  # supported upstream (upstream does aarch64 flatpak builds)
  OOO_CHECK_ARCHS := amd64 arm64